Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:06:30 +0000 (08:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:06:30 +0000 (08:06 -0700)
commit783a0b19742b1c8230b61e3244f7a8eb5ba2a972
treeeffa3bbad431d06e6c85c3ccf88b508eba1f9c69
parent14a1a9e5a4c87826012a3792a9d866ea5fe58cc7
parent21b796d6f950b453df0e712d86f65b66f104dc86
Merge from trunk.